From e7a7e191878420531b66346b9b43e696a0d77627 Mon Sep 17 00:00:00 2001 From: "kaf24@localhost.localdomain" Date: Fri, 29 Dec 2006 16:23:11 +0000 Subject: [PATCH] Explicitly use GNU msgfmt on non-GNU systems. Signed-off-by: John Levon --- config/StdGNU.mk | 2 ++ config/SunOS.mk | 2 ++ tools/python/Makefile | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 2b767517b8..32a37b44fa 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -9,6 +9,8 @@ STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +MSGFMT = msgfmt + INSTALL = install INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 diff --git a/config/SunOS.mk b/config/SunOS.mk index 5d548054d3..77e4b24825 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -9,6 +9,8 @@ STRIP = $(CROSS_COMPILE)gstrip OBJCOPY = $(CROSS_COMPILE)gobjcopy OBJDUMP = $(CROSS_COMPILE)gobjdump +MSGFMT = gmsgfmt + SHELL = bash INSTALL = ginstall diff --git a/tools/python/Makefile b/tools/python/Makefile index 1c3a6c4ffc..085ac84b5a 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -7,12 +7,12 @@ all: build .PHONY: build build: CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build - if which msgfmt >/dev/null ; then \ + if which $(MSGFMT) >/dev/null ; then \ for file in `cd xen/xm; find messages -name xen-xm.po`; do \ dest=`echo "build/$$file" | \ sed -e 's#xen-xm.po#LC_MESSAGES/xen-xm.mo#'`; \ mkdir -p `dirname "$$dest"`; \ - msgfmt -c -o "$$dest" "xen/xm/$$file"; \ + $(MSGFMT) -c -o "$$dest" "xen/xm/$$file"; \ done; \ fi @@ -26,7 +26,7 @@ install: install-messages endif install-messages: all - if which msgfmt >/dev/null ; then \ + if which $(MSGFMT) >/dev/null ; then \ mkdir -p "$(DESTDIR)/usr/share/locale"; \ cp -R build/messages/* "$(DESTDIR)/usr/share/locale/"; \ fi -- 2.30.2